From 42738582990171fbed020a7457cb4c3e1aa7a737 Mon Sep 17 00:00:00 2001
From: "Kim F. Storm" <storm@cua.dk>
Date: Thu, 21 Sep 2006 08:42:25 +0000
Subject: [PATCH] *** empty log message ***

---
 lisp/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5af184402ce..fc0ae4845ba 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -62,7 +62,6 @@
 	* menu-bar.el (clipboard-yank): Bomb out in interactive use if
 	buffer is read-only.
 
->>>>>>> 1.10102
 2006-09-18  Ken Manheimer  <ken.manheimer@gmail.com>
 
 	* allout.el (allout-unprotected): Let inhibit-read-only only when
-- 
2.30.2